From 4d98d3ebfc88e637f9f00c787cf07e9e6c6bd3b5 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 26 Apr 2016 08:04:46 -0500 Subject: [PATCH] blktap2: use abort() instead of custom crash Instead of trying to write a snippet of code that crashes the process just use abort() directly. This is to fix the build on clang which detects that the snippet of code will crash and fails to compile. At the same time removed extraneous whitespace in the macro. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper Acked-by: Wei Liu Release-acked-by: Wei Liu --- tools/blktap2/drivers/tapdisk-vbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c index 31bc2fe3d1..e2e9cd5bc9 100644 --- a/tools/blktap2/drivers/tapdisk-vbd.c +++ b/tools/blktap2/drivers/tapdisk-vbd.c @@ -49,18 +49,18 @@ #define DBG(_level, _f, _a...) tlog_write(_level, _f, ##_a) #define ERR(_err, _f, _a...) tlog_error(_err, _f, ##_a) -#if 1 +#if 1 #define ASSERT(p) \ do { \ if (!(p)) { \ DPRINTF("Assertion '%s' failed, line %d, " \ "file %s", #p, __LINE__, __FILE__); \ - *(int*)0 = 0; \ + abort(); \ } \ } while (0) #else #define ASSERT(p) ((void)0) -#endif +#endif #define TD_VBD_EIO_RETRIES 10 -- 2.30.2